diff options
| author | Adam Soltys <[email protected]> | 2023-01-19 16:00:17 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-01-19 16:00:17 -0800 |
| commit | f7d9ec75ac19664fdfffd430ece29f288d6d4819 (patch) | |
| tree | eda0c591ef972891f1908a5b1e91e2855b7eef59 /src/routes/(app)/[username] | |
| parent | 67c4af186fec0423664b18847921eb9696a1eeef (diff) | |
| download | coinos-ui-f7d9ec75ac19664fdfffd430ece29f288d6d4819.tar.gz coinos-ui-f7d9ec75ac19664fdfffd430ece29f288d6d4819.zip | |
rename network to type
Diffstat (limited to 'src/routes/(app)/[username]')
4 files changed, 16 insertions, 12 deletions
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js index 281f9e2d..5d7c3044 100644 --- a/src/routes/(app)/[username]/address/+page.server.js +++ b/src/routes/(app)/[username]/address/+page.server.js @@ -4,10 +4,7 @@ import { redirect } from '@sveltejs/kit'; export async function load({ cookies, params, parent }) { let user = (await parent()).subject; let rates = await get('/rates'); - let invoice = { - network: 'bitcoin', - rate: rates[user.currency] - }; - let { id } = await post('/invoice', { invoice, user }, auth(cookies)); - throw redirect(307, `/invoice/${id}`); + let invoice = { type: 'bitcoin' }; + let { hash } = await post('/invoice', { invoice, user }, auth(cookies)); + throw redirect(307, `/invoice/${hash}`); } diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 314e3577..262a7348 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -7,6 +7,7 @@ import { goto } from '$app/navigation'; import { t } from '$lib/translations'; import { events } from '$lib/store'; + import { v4 } from "uuid"; export let data; $: ({ invoices, requests } = data); @@ -85,7 +86,7 @@ >{$t('user.dashboard.deposit')}</button > </a> - <a href={`/send/voucher`}> + <a href={`/send/pot/${v4()}`}> <button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-full" >{$t('user.dashboard.voucher')}</button > diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index e37b3221..f6de4c27 100644 --- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -152,10 +152,16 @@ </a> {:else} <div class="text-secondary flex"> - <div class="text-3xl">⚡️</div> + {#if tx.type === 'lightning'} + <div class="text-3xl">⚡️</div> + {:else} + <div class="my-auto mr-1"> + <img src="/images/bitcoin.svg" class="w-12 border-4 border-transparent" /> + </div> + {/if} <div class="my-auto"> - {tx.amount > 0 ? 'Received' : 'Sent'} + {tx.amount > 0 ? (tx.confirmed ? 'Received' : 'Pending') : 'Sent'} </div> </div> {/if} diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte index 18d6b21e..47c507fa 100644 --- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte +++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte @@ -9,9 +9,9 @@ export let data; export let form; - let network = 'lightning'; + let type = 'lightning'; - if ($page.params.param === 'bitcoin') network = 'bitcoin'; + if ($page.params.param === 'bitcoin') type = 'bitcoin'; let { request } = data; @@ -25,7 +25,7 @@ <input type="hidden" name="amount" value={amount} /> <input type="hidden" name="currency" value={currency} /> <input type="hidden" name="username" value={username} /> - <input type="hidden" name="network" value={network} /> + <input type="hidden" name="type" value={type} /> {#if request} <input type="hidden" name="request_id" value={request.id} /> |